[TAPDISK] Move tapdisk control files from /dev/xen to /var/run/tap

Signed-off-by: Jake Wires <jwires@xensource.com>

diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c
index 499da6add941471da76cb0fbc9b3c94929887bac..938c53d273a7738d749f4043d9c73706f683be9a 100644 (file)
--- a/tools/blktap/drivers/blktapctrl.c
+++ b/tools/blktap/drivers/blktapctrl.c
@@ -495,11 +495,13 @@ int blktapctrl_new_blkif(blkif_t *blkif)
 
                if (!exist) {
                        DPRINTF("Process does not exist:\n");
-                       asprintf(&rdctldev, "/dev/xen/tapctrlread%d", minor);
+                       asprintf(&rdctldev, 
+                                "%s/tapctrlread%d", BLKTAP_DEV_DIR, minor);
                        blkif->fds[READ] = open_ctrl_socket(rdctldev);
 
 
-                       asprintf(&wrctldev, "/dev/xen/tapctrlwrite%d", minor);
+                       asprintf(&wrctldev, 
+                                "%s/tapctrlwrite%d", BLKTAP_DEV_DIR, minor);
                        blkif->fds[WRITE] = open_ctrl_socket(wrctldev);
                        
                        if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) 

diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h
index 078a2931857494cae851999f9e2ee73b41cac3c5..996ed60aa9dfc7ec11bf79ec29e7089e41441468 100644 (file)
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -78,7 +78,7 @@ static inline int BLKTAP_MODE_VALID(unsigned long arg)
 
 #define BLKTAP_IOCTL_KICK 1
 #define MAX_PENDING_REQS       BLK_RING_SIZE
-#define BLKTAP_DEV_DIR   "/dev/xen"
+#define BLKTAP_DEV_DIR   "/var/run/tap"
 #define BLKTAP_DEV_NAME  "blktap"
 #define BLKTAP_DEV_MINOR 0